From: Linus Torvalds Date: Sat, 25 Sep 2010 16:51:54 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block X-Git-Tag: archive/raspbian/4.9.13-1+rpi1~10^2~16606 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=56162badadb91aae93843d8d6558c7d7780e3cb2;p=linux-4.9.git Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: block: prevent merges of discard and write requests --- 56162badadb91aae93843d8d6558c7d7780e3cb2